Tighten up ABI checks a bit

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index e4f00787173cdb2f951c5b37df227e3df3f24dc3..438a8f70a9841270e455f148b5b5cd69b6f62ae3 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * abicheck.sh: Also check exported variables.
+
 2005-08-02  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.7.5 ===

diff --git a/gdk-pixbuf/abicheck.sh b/gdk-pixbuf/abicheck.sh
index 989c5e4f2a3fc9abefc05d615250b05cd49518f4..aedfddf8cc582d5905f93dfe7e53f4dd599f87db 100755 (executable)
--- a/gdk-pixbuf/abicheck.sh
+++ b/gdk-pixbuf/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
-nm -D .libs/libgdk_pixbuf-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
+cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+nm -D .libs/libgdk_pixbuf-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi

diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh
index e779838fc3dcedb9783fe44a1effda9bd5ec8c84..bdd727d43adf450045a5d324ed1d95f89ad1623b 100755 (executable)
--- a/gtk/abicheck.sh
+++ b/gtk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
-nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
+cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
+nm -D .libs/libgtk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi